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

Change-Id: I2fb7807f48d6ca1f28371c80f8c111268ca08e21