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

Change-Id: I69cc402859f4d18528ed8dbb9be0c73a1e29ca58