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

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

Change-Id: Ibe802a15ab203d206d898ee4feb7d4a94037e5cf