Merge "Simplify HIDDEN_API_ENFORCEMENT_ flags"
am: a37a1edd73

Change-Id: I25c9d4b2c10ebaafdb1bda321019a35a285c2707