Revert "for testing: Build with hwcomposer"

This reverts commit e449db301287c416fc8d254a9885c76933541ab9.