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

Change-Id: If8a8e8f4be010b03375b923db7a248058590ee5a