Merge "Revert "Move error_code.h into otautil."" am: b23d29642d
am: b87edb00dc

Change-Id: I43d041f1f59766066240f6e535f1b9839e783c25