Merge \"Convert Android.mk to Android.bp\"
am: 121749182e

Change-Id: I96e92e1e3cd51cf5be97d592ee580a9ab6dc5cb9