am fceb59b7: (-s ours) am 3870c666: fix SDK build breakage in mr2-dev and NEON

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