am cf4e98b2: am b84cf9e1: Clean up the SDK and make it compiled and installed in the SDK system image.

Merge commit 'cf4e98b260230ea5d9290d2e18f37b2f3c585970'

* commit 'cf4e98b260230ea5d9290d2e18f37b2f3c585970':
  Clean up the SDK and make it compiled and installed in the SDK system image.