Merge "Add a missing #include for openat(2)." am: 3ac0dd2a56
am: cdfe2895b4

Change-Id: I0924ddf2096e076bd6a32b850c25e575f080041d