This reverts commit 3daf4d32. Temporarily disable due to high rate of crashes from endLayer check Bug: 26609444 Change-Id: I7583a77bf5cc1e722fa4042db0542f80cd978760