Merge "Add missing LOCAL_MIN_SDK_VERSION for Support Library demos" into nyc-dev