Merge "Update SDK lint to the 2.0 release version" into emu-2.0-release