Revert "Merge remote-tracking branch 'cm/cm-11.0' into HEAD" <-- BROKE BUILD

This reverts commit 1885895633cfbed3d3337c3a66847af0c253809d, reversing
changes made to 0bfcf0135e4474342766e814471fdb354943378e.

Change-Id: I136623a8bf10f9e61e4e46753bf4cb439eb17420