[automerger skipped] Merge "Clean up errno logs and sto* conversions" into...
[automerger skipped] Merge "Clean up errno logs and sto* conversions" into rvc-dev am: ee08459e am: 2d4aefad am: 419db355 am: e2456852 -s ours
am skip reason: Change-Id Icdd8a6af8564d5de3bedd1bc934f7928eb5e66e9 with SHA-1 75a80f6b is in history
Change-Id: I195ce03fab1b7f8b81666d3d20d438b459a89031