Merge "Respect LOCAL_MIN_SDK_VERSION for dx"