am 8034415d: resolved conflicts for merge of 08e72d01 to jb-dev-plus-aosp

* commit '8034415ddd8404f8788199ed993af89692235dc5':
  bionic: add support for non-NEON memcpy() on NEON SoCs