[automerger skipped] Merge "Convert frameworks/base/cmds/* to Android.bp" am:...
[automerger skipped] Merge "Convert frameworks/base/cmds/* to Android.bp" am: 179e1328 am: aa9e302a
am: 86860a52 -s ours
am skip reason: change_id Ieb54feb3902bddfd5a571369fbf50161ae646647 with SHA1 0a2d8cbb is in history
Change-Id: Iac4445001f4ed12a5da331dc353bfa3918e22e78