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

Change-Id: I83cde46eed03e003f38546e89f1dbfb59f33df3d