Merge "Drop the O_NOFOLLOW flag." am: 0e41945e3a am: ee7d15d542

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1679497

Change-Id: Ie059d5363f2b1c0727aee64043a5149e2e679097