Merge "Convert Android.mk to Android.bp"
am: a64fe320ae

Change-Id: Id3b3e6c46e8f686aa479d35dfd2d202727084caf