Merge changes I2b06ad79,I8b48188d

* changes:
  composer: add SKIP_VALIDATE to AIDL
  composer: remove getClientTargetSupport