Merge "improve hwc log output" into ics-factoryrom