Merge "Fix Java compile config for ccsdk and sdnc"