Merge "Revert "Assert no execute-only segments for targetSdkVersion<Q""