Add ANDROID_BATT back in