Revert "for testing: Build with hwcomposer"

This reverts commit ce0bfcc5bdfeb27011010ff6ffa500e8906c202d.