Merge 4.4.1 from aosp
Move DEXOPT flag to cm.mk