Merge "Revert "Change command-line flags of hiddenapi""