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

Change-Id: I7c7852bc5b7f5bc7ea234098b3e9b8522211f32b