Merge "Reorganize hwui test directories"