Merge "Fix file permissions to remove execute bit on ordinary files" am: 96a663b0ef am: 0e30ca6437 am: 4984eb5e21 am: 37e9654973 am: 45d6dc964d

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1416258

Change-Id: Ic7a15541f3f6a835fdd95786a722f92252223e3c