Use little bit longer GPL-2.0+ instead of GPL2+

Per http://spdx.org/licenses/

Change-Id: I23f5b70b78d46b9756254e63ac03e6e12edd7f4a
Merge "Use little bit longer GPL-2.0+ instead of GPL2+"