Merge "Convert Android.mk file to Android.bp" am: c000ec0cd8
am: 26fe49112d

Change-Id: I335628f7d658b0251c6df413ea3f1921365bc15d