Merge pull request #174 from Seinlin/bug-982463-2-v1.4

Bug 982463 - Add base-kk-aosp.xml for manifests depend on caf. r=mwu
Bug 1011958 - ICS build bustage in out/host/linux-x86/obj/EXECUTABLES/triangleCM_intermediates/triangleCM,r=edmorley
Bug 1015827 - Add librecovery for gonk-kk manifest file. r=mwu

Change-Id: I7f9d6ea08fcd5ac3e6714b88dacf6b8dc0603be8
Merge pull request #184 from Seinlin/bug-1015827-v1.4

Bug 1015827 v1.4
Merge pull request #182 from viralwang/bug1000581

Bug 1000581 - remove rilproxy for flame
Conflicts:
	base-caf-jb.xml
Fix a typo in manifest. r=mwu

Change-Id: Iddb865f25de966a3c36e33aee02ffc29ca9a8cb4
Merge pull request #192 from Seinlin/bug-1015827-v1.4

Bug 1015827 v1.4
Bug 1014485 - [Flame][NFC]: NfcConnector::Create() still keep calling socket() to consume performance even device has no nfcd. r=mwu
Merge pull request #194 from msliu/v1.4

Bug 1014485 - [Flame][NFC]: NfcConnector::Create() still keep calling so...
bug 910745 - fix dangling revision in nexus-s, remove tara. r=release
bug 910745 - lock 3rd party repo revisions. r=release
bug 910745 - lock down platform_frameworks_av and platform_system_core
due to build bustage. r=bustage