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

Change-Id: Icb0259b5a2c4053b8656c4b3af782d5e57e7ba78