Merge "Update hwui deps due to libtonemap" into tm-dev