CMake build updates:

- The conflict with warped_motion has been resolved.
- This also resolves a configure build mismatch with
  ncobmc_adapt_weight: warped_motion forcing it to off
  caused the mismatch.

BUG=aomedia:856

Change-Id: Ida2f68676c8a25a63c631dbfe101041409dcafe6