Merge "Make sure to use LOCAL_MIN_SDK_VERSION when needed" into pi-dev-plus-aosp