Merge branch 'security-aosp-pi-release' into int/p/fp2

* security-aosp-pi-release:
  Address photo editing security bug

Change-Id: I4097070bdcb7824e71071817c0a0eeb7487f4295