Merge "give dir creation permission to system_server"