Use Liquid Optimizations

Change-Id: I5ea7dafb250ec4815fbefc3adfc9ab7b873e4e9e
Merge "Use Liquid Optimizations" into lollipop