Merge "Add permission and permission.xsd"
am: e5d100518d

Change-Id: I2bfa1ae166ac8cba7a2668f69a355203b41e2570