Merge "Make the local-sdk-path arg optional."