Merge "Convert Android.mk file to Android.bp" am: f526e6009b am: eb886a265f
am: 81500dbffe

Change-Id: I91a0a9fecc1aa141d933cd38c868f8eb05180de6