Switch back to QCOM ION, since it is more up-to-date than AOSP

Change-Id: Ifc1dcddaa139ef5282e5e4c155285523b4abd4ec