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

Change-Id: I351348ffec738150d74f1d00cb4ccc0eed3c6e1b