Merge "Create cpp aidl_interface for libstatsbootstrap"