[automerger skipped] Merge "Add a setting to allow a user to choose the native...
[automerger skipped] Merge "Add a setting to allow a user to choose the native image format" into rvc-dev am: a1e1f069 -s ours
am skip reason: Change-Id Ia154a97312959b18eaa1c43bdee3bb02912683f2 with SHA-1 35ec8ed1 is in history
Change-Id: I2aea4bb6f6c5894c6ce995062d16498126f3bc7c