build: core: Parameterize recovery with a variant

Include extra vendor config early.  If RECOVERY_VARIANT is set, use it
to look for the recovery in an alternate path.

Change-Id: Iba54f0746d728c0dfeeb67b4d3166d5e25b1b5d7
Signed-off-by: Arnav Gupta <championswimmer@aokp.co>
Merge "build: core: Parameterize recovery with a variant" into kitkat
Build: support building with openjdk and java6

Change-Id: I4359f802722a7563ff9acbbc9f30b8f7499f4609
Merge "Build: support building with openjdk and java6" into kitkat
Merge branch 'kitkat' of https://github.com/AOKP/build into kitkat