[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: 8bf89307 am: 6c9488c3 -s ours
am skip reason: Change-Id Icdd8a6af8564d5de3bedd1bc934f7928eb5e66e9 with SHA-1 1173a725 is in history
Change-Id: Icb36e33e21cf32a7fe47d241f5a98362ba04098a