Merge "Neverallow executable files and symlink following" am: 125cbf19de am: 1f46d6c4e7
am: 8287015e8e

Change-Id: I6a29bc2c001c48ebf3e3cff19b054d6e4b7accd1