Merge "hidl2aidl: conversion of gatekeeper hidl to aidl"