[automerger skipped] Record system call relevant errors correctly am:...
[automerger skipped] Record system call relevant errors correctly am: 816b6a77 am: 809898c2 -s ours
am skip reason: Change-Id I781513e385e1cf2a77d1d052c4a450a94978e242 with SHA-1 23d55192 is in history
Change-Id: Icf8f9d18e61c52f3cbc2954480c13bd8df094c57