Merge "Frameworks/base: Shorten system property" into nyc-dev