Merge \\"libcutils: Switch to Android.bp\\" am: bc6c52f905
am: 4e8bb3e677

Change-Id: Ieb91f7c4925817fbdb0bba7b94a103752797aa08