Merge "Convert Android.mk file to Android.bp." am: a8080680d2
am: 0bce21a8c2

Change-Id: I1f1da99510ad35bca7cecdcfc2ff0479b1895563