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

Change-Id: Iaae064dd6f0a4902ccebe0bc6e9cb06849a2ab5e