Fixing adbd so that it's respectful of /data/misc/adb/adb_keys once
again. <facepalm>

Change-Id: I334633b0ef895a740a2749382f311666bfde07b2
Fixed building incrementals when "no separate recovery" is specified.

Change-Id: I1d7add44554ebc4b68dc09debdd0c0fb229061a9
Merge branch 'kk' of https://github.com/CarbonDev/android_build into HEAD