fix

Change-Id: Ic878022d2e22fad17ed88a2ba770f886bea03ad9
Merge remote-tracking branch 'cm/cm-11.0' into du44

Change-Id: I5bed1e39bcf26e099a6bf621fc416a8209114428

Conflicts:
	include/hardware/audio.h
	include/hardware/power.h
Revert "Merge remote-tracking branch 'cm/cm-11.0' into du44"

This reverts commit 6f001e0ea47c925a62f2b9f103efd8e53e39fc9c.
Revert "fix"

This reverts commit 89d8c4bef28e3d1ecb51575c9291ff0cb076b961.
Revert "add changes to build falcon"

This reverts commit 958ecbf69c824ce573f7975dab0c7576f590c5df.
Merge remote-tracking branch 'cm/cm-11.0' into du44

Change-Id: I5bed1e39bcf26e099a6bf621fc416a8209114428