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

Change-Id: Ic8568d15d6ca2671648edda1c2fbe8267d721d89