Merge "Simplify hidden_api.h logic"