Merge "libcpustats: Android.mk -> Android.bp"