Merge "Temporarily disable 137-cfi for cdex"
am: ce79886705

Change-Id: I6fa3b22305e801153fc06924315fcf15047b3597