JFLTE stands divided

Change-Id: I54f76f3ead56cd38f9291f62fd19d3872f3e3fa7
Merge branch 'L5' of https://github.com/VanirAOSP/platform_manifest into EXODUS
Merge remote-tracking branch 'upstream/EXODUS' into EXODUS

Conflicts:
	default.xml