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

Change-Id: I490ab8fcc08f0658926ee00a48b3347e5d95d846