Merge "Split hwui's makefile"