Merge "Add dex item for hiddenapi flags"