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

Change-Id: I1cdaf9f2bf9f68b40fa4d47259ea05ce79378c61