Merge "libcpustats: Android.mk -> Android.bp" am: 58a1634616
am: d5a262c462

Change-Id: I712482567197e99b175c3e556579dab713e16193