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

Change-Id: I825715a956f44a0b4371a1526a054c05fac05326