Merge "Update the path to error_code.h." am: 4aab2f3500 am: 9800e87306
am: b56ea6e595

Change-Id: I6f9c9096e74f62a5275cd1aff56c6480322ea602