Merge "Convert to Android.bp"
am: 9c3af9383f

Change-Id: Ia8a7182747f38473ab6999cf1a640e2db51f88bf