am c2eb12b2: am 9f0af9ec: Merge "zygote/dex2oat: Grant additional symlink permissions" into lmp-sprout-dev

* commit 'c2eb12b24c0c8b265745d049c0bed9f9fd1e4241':