[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: 86265e34 -s ours am: 84811be1 -s ours
am skip reason: Change-Id Icdd8a6af8564d5de3bedd1bc934f7928eb5e66e9 with SHA-1 75a80f6b is in history
Change-Id: Iee0ff0d9e1ca12821d373dd681531cce012e74fb