keymaster: switch to caf variant

this is cleaner then adding again flags
Stk: switch to caf variant

Change-Id: I1fd797a42b1e2ecd834e13f9634ec2a2087e01a9
Manifest: CAF add contact repos

  * apps_Contacts
  * apps_ContactsCommon
  * providers_ContactsProvider

Change-Id: Ib9cdf372032de57055171fe2576aab5e9beb164a
Signed-off-by: Josue Rivera <prbassplayer@gmail.com>
Manifest: CAF Fix STK repo name

Change-Id: Ia4b0396a3b00967f91768876d9171640f2af1630
Signed-off-by: Josue Rivera <prbassplayer@gmail.com>