Merge "Make sure to use LOCAL_MIN_SDK_VERSION when needed" into stage-aosp-master