Merge "Introduce android:preferCodeIntegrity, private for now"