Merge "libsysutils: Android.mk -> Android.bp" am: d0013343e9
am: 01ff125c20

Change-Id: I191ed9297797e9ab014d00cb96a8c319184e487e