Merge "libsysutils: Android.mk -> Android.bp"