Merge "Convert Android.mk file to Android.bp" am: 8dddb7086d
am: 8414dcc9ab

Change-Id: I5d4ce2782411b21a78487bdd3831514fc68d2a05