Merge "Remove LOCAL_SDK_VERSION.  We haven't finished unbundling."