Merge "Convert Android.mk file to Android.bp." am: 4a5064b387 am: e9213fdd05
am: 594190a972

Change-Id: I6ee95b897572e42b95098fe984b809e45f218308