Merge "Convert frameworks/base/cmds/media and bmgr to Android.bp"