Merge "hiddenapi: Fix class hierarchy traversal" am: 676e00a12f
am: cf2e13c961

Change-Id: I35af81b004eedf1a1427fd685e365d269fa3f140