Merge "Compile android-non-updatable separately"