Merge \\"Convert more Android.mk files to Android.bp\\" am: 4c06cd8634
am: e42cfef51b

Change-Id: Ibc3420000823ca5cbc97951e1a887a2ad067396e