Merge "Allow correct interpretation of ANDROID_ACTIVE_PARTITION"