Merge \\"Convert Android.mk to Android.bp\\" am: 121749182e
am: 3225a83c99

Change-Id: I3d2379f379bb95a63dbaa66a51222aa91ee719b2