Merge "Pass APK_IN_APEX flag when parsing apk in apexes" into tm-dev