Compatibility ndk r9d armeabi-v7a-hard APP_ABI building.
Update ViewController.mm

Fix scale for iPhone 6 Plus
Merge pull request #7001 from i25ffz/master

Compatibility ndk r9d armeabi-v7a-hard APP_ABI building.
Merge pull request #7005 from mgaver/patch-9

Fix a scale for iPhone 6 Plus
Update submodules, buildfix before merging the rest of the dualhead support pull requeset
Win buildfix
x86jit: Oops, don't pad INT3s in prelinked blocks.

Fixes #7007.
Merge https://github.com/hrydgard/ppsspp

Conflicts:
	native