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