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

Change-Id: I51c4a95e4cc6b3307da3094e8c82d66c678b37eb