Merge "Change the dist path of api files" am: 324083b211
am: 73b05731b4

Change-Id: Ie1af9f84d0798229a0894bbbdf3200616426f585