Merge "New version of api-generator tool am: 9d7407b954 am: 3b28f9d564" into oc-dr1-dev-plus-aosp
am: e30aa87f68

Change-Id: I11b6cf2062520db5786f951c77dbd178be522c85