4.3.1

Change-Id: I307be80d0ab71f0bf79d30abbb734f85d5578592

Conflicts:
	default.xml
Merge branch 'jb43x' of https://github.com/moongato/platform_manifest into jb43x