Merge "New libhwui test activity"