Fix support API file and import script am: faeea72e91 am: b9e04acffc am: d0afdf44c1
am: 294b8e37a5

Change-Id: If708f7b3257c0169d3e2b9348448de5d5b8019a2