Merge "libbinder - split out libbatterystats_aidl"