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

Change-Id: I2176bf9c67bac0cb19d0d458963058430afbc3b0