Merge "Cleanup of libhwui" into jb-mr1-dev