Merge "libsysutils: Android.mk -> Android.bp" into oc-dev