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

Change-Id: Ib25ea1bb2f192299a2b98bdc6040aa1e5e32473c