Merge "Revert "Use renderengine::drawLayers api everywhere.""