Merge "Convert to Android.bp"
am: 99de09fe7f  -s ours

Change-Id: I16fbbe0cdeffe80b7b92148f696ec2db848cd4cf