Merge "project: mdm9640: Turn on Werror"