Merge changes Icd65d906,I109cb9db

* changes:
  Don't apply the OECF twice to multi-stop gradients
  JNI does not use hwui_flags but LOCAL_CFLAGS