Merge "Add hidden API list file variables"
am: a5cc50ab4c

Change-Id: I1f6855936dd9a3ec952f7c43695891216ecd242a