Merge "Support7Demos: Set LOCAL_MIN_SDK_VERSION to 7" into nyc-dev