Merge "Remove -Wno-error from system/extras"
am: 8ac93f3822

Change-Id: I71991761104b55593ce7784d8729788d223f97a5