Merge "Use LOCAL_SDK_VERSION current instead of system_current in externalservice tests." into nyc-dev