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

Change-Id: I70ba131665ec248ae91ceee7f87fac1ad035a484