Merge "Don't use prebuilt_apex when TARGET_FLATTEN_APEX is set to true am: 0a573d79 am: 3c8fd299" into qt-r1-dev-plus-aosp