Merge "Simplify HIDDEN_API_ENFORCEMENT_ flags" am: a37a1edd73
am: b28c0842e4

Change-Id: If4c99cfa79b9d8980044d5306e43c92b07aee1e6