Merge "Increase java mem size for ccsdk/features"