Merge "Convert Android.mk file to Android.bp" am: 9d9163f90c Change-Id: If8ba2cfee6308a3d536adbb6f10dabc77abefaa3