Merge "Gatekeeper generated aidl cpp bindings"
am: ecf4d59309

Change-Id: I04f6359fecda189f3cc395a26524b925d4b23704