Raspberry Pi includes moved from rpi.patch to CXXFLAGS for armv6h