Fix handling of proxy classes in hidden_api.h am: 6a1dab4184 am: ae6f8c5ca4
am: 31cf035665

Change-Id: I2edf52fc6fa0b4d78ae2b8e33fe8ab1e8c6aa2e6