Merge "Fix a call to openat with incorrect arguments" am: 18044da576 am: 5675b05f52
am: dca9c41a79

Change-Id: Ibfb8cf5508a19593379bce4b6626484757ddef5f