Merge "composer: remove non-hidl composer compilation"