Merge "Define PROT_READ and PROT_WRITE when generating the policy files" am: a1721a5043
am: 158208cde0

Change-Id: I6855db3d6f56067983fd89e2c330223cb82ab9a2