Merge "Revert "composer: adds BufferAhead for the LayerCommand.aidl""