Merge "hiddenapi: Fix class hierarchy traversal"