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

Change-Id: I0a408777b9fcbc1a84f4fa8217ab2ce5ffb4e8a9