track upstream build

Change-Id: I7d5fc3a8452f96ae6e8265dffa6beed2d8ac3087
track local vendor/cm
Merge branch 'cm-11.0' into perf/cm-11.0

Conflicts:
	local_manifest.xml

Change-Id: Ib0b0721c11a67152446378892f222c5a3a530207
Revert "track upstream build"

This reverts commit 8f89d93766ae2f4a7060f8425807f313a4087c1a.

Conflicts:

	local_manifest.xml

Change-Id: I74ed0dbcc71479473dde26a5a730114641efd571