[automerger skipped] Merge "gui/math: Set min_sdk_version" am: ef685e33 am:...
[automerger skipped] Merge "gui/math: Set min_sdk_version" am: ef685e33 am: 55a7e234 -s ours am: 1c480ea2 -s ours
am skip reason: Change-Id Ib7685f5f4f924ac145eb4f10ad83a6c0548b2206 with SHA-1 54042e0a is in history
Change-Id: I154e0c5d14f9cc0055c948770d7b189d4776013b