Merge commit 'refs/changes/19/5119/1' of http://gerrit.sudoservers.com/AOKP/platform_manifest into UB

Conflicts:
	default.xml

Signed-off-by: KainGC <cows_say_potato@yahoo.com>
Merge branch 'UB' of https://github.com/KainGC/platform_manifest into UB

Conflicts:
	default.xml

Signed-off-by: KainGC <cows_say_potato@yahoo.com>