Merge "Neverallow executable files and symlink following"
am: 125cbf19de

Change-Id: I7a50f01e1bac24beb9fe516b11f6d7f8c6667b64