Merge "Disable the new pass manager for libhwui" am: 3268a5ec1a
am: 9a283f69a0

Change-Id: Iee4f93e21a84b22c8eda56c331f3a116c3af7ca0