Merge "Add command buffer support for AidlComposer"