Merge "111614464: Update the api-generator script" into pi-dev
am: a66fb8f32f

Change-Id: Ib45f0d4ffb9454b6994848bbae06e79abfda8e9c