Merge "libcutils: Switch to Android.bp"