Merge "Revert^4: Add dex item for hiddenapi flags"