Merge "Log the errno code for failed flock() invocations" am: 24c0570839 am: 79dadf1902
am: a0218a2499

Change-Id: I3d23be58f6dd14ac3d3e9da53a81e905ff934be7