Merge "New version of api-generator tool am: fc2e8eaf31 am: 0f98d034e8" into oc-dr1-dev-plus-aosp