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

* commit '9690230a3c22977be24006d24ea35dd3efadc362':
  Fix the build for NEON in libpixelflinger