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

Change-Id: I06cf534ee578ad9d103d7adc031d103e7e4e7584