Fix architecture config and init properties
Fix architecture config and init properties

PiperOrigin-RevId: 170443084

android/android-test,android/android-test,android/android-test,android/android-test,android/android-test