Merge "msm8974: Re-enable TARGET_USES_ION flag"