Merge "CDD: Require NEON support for armeabi-v7a" into mnc-dev