Merge "checkpolicy:  Fix precedence between number and filesystem tokens."