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

Change-Id: Id63722370ff9382382e40e55ac31b386a1de0c01