Merge "Disable crashing drop shadow tests" into oc-dev
am: 9d67b50308

Change-Id: I4092a41511abcc8652bd4e482ee8c81738c1e009