Merge "Revert "Add dex item for hiddenapi flags""