Merge "Convert to Android.bp"
am: d81c8f2604

Change-Id: Ic7f2f82715ccfb3278c66a69fac18206eac2ac02