Merge "Convert frameworks/base/cmds/* to Android.bp" am: 179e132823
am: aa9e302a63

Change-Id: I05de333caa6aa5ed6b33389e2c320d845b9a36ee