Merge "Fix permission strings to match ICS-FactoryROM."