Fix support API file and import script
am: faeea72e91

Change-Id: Ic263b7dcaa02530c12cc4e89929f61131e82f39c