Merge "Remove -Wno-error from system/extras"