am 0a8a5636: Merge "Fix the build for NEON in libpixelflinger"

* commit '0a8a56361e2b54d0e2a9e2c2f7a7ab47dc76c650':
  Fix the build for NEON in libpixelflinger