Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
Revert "dalvik: dalvik device extension pack."

This reverts commit 337a595d746d34ade52e3aba2c739455dfd3cf57.

Conflicts:
	vm/Dvm.mk
	vm/compiler/codegen/arm/CodegenDriver.cpp
	vm/compiler/codegen/arm/Thumb2/Gen.cpp