Fix support API file and import script am: faeea72e91 am: d3d5ab5056
am: 34960a226d

Change-Id: I46c50f657bedb362313fd1b1c24d034ed8355153