Merge "Use -Werror in system/extras" am: 560b2196d5 am: 954d9ce3e7
am: d79020a5e4

Change-Id: If94da7caa721aa7394ff15819216348600b59691