Merge change 9449

* changes:
  Fixes for skia to build for armv4t Since we are no longer supporting the armv4 architecture (see 9336 and 9378) but instead armv4t we should test on __ARM_ARCH_4T__ instead of __ARM_ARCH_4T__