Merge remote-tracking branch 'upstream/master' into fps2

Conflicts:
	native
Merge branch 'fps2' of https://github.com/leejuiping/ppsspp into fps2