Commits
John Reck authored and The Android Automerger committed 215ebacf060
Temporarily workaround merged bitmap bug Bug: 26569206 Merged bitmap ops are buggy, just turn them off for now to unblock testing Change-Id: Ic0151bb3f23b1843107806659a64b26fd6d6e19e