am 3870c666: fix SDK build breakage in mr2-dev and NEON

* commit '3870c6666e2e7d372daa6e0610f0f83695c954ec':
  fix SDK build breakage in mr2-dev and NEON