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

Change-Id: I98495fa8d92bb72cc9f42e9874e4bcfc92d821f5