This should make your clean-up easier

Change-Id: I51c490279dba5ad8479200abeffbf416833955d7
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
Disable multithreaded dexopt by default

* There is still a race condition here.
* Power users can re-enable this by setting
  persist.sys.dalvik.multithread to true

Change-Id: I03686bafbac1859695466fcb522bc5436ec82e0d
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
Merge branch 'cm-11.0' of https://github.com/androidarmv6/android_vendor_cm into cm-11.0