Merge changes I8471c508,Ie889c3aa into oc-mr1-dev

* changes:
  sdk: copy encryptionkey.img to x86{_64} image zip
  sdk: use 3.18 kernel