Merge "Gatekeeper generated aidl cpp bindings"