Merge "Convert Android.mk file to Android.bp" am: 0c3aca9360
am: f45318ec50

Change-Id: I477f94a3bf28ba1604488332794cdf879fce22c1