local_manifest: update manifest

Change-Id: Ib003f189d80e0fae29cb46bad7457f4973c65496
Merge branch 'cm-10.2' of github.com:TeamHackLG/local_manifest into cm-10.2

Conflicts:
	local_manifest.xml

Change-Id: Id89e50a84a8972b9486d0e5da9ff68bef8f809d6