Merge kk_2.7_rb1.15

Use codeaurora.org's repo to bring CAF in line
    ,--.
   ([ oo]
    `- ^\
  _  I`-'
,o(`-V'
|( `-H-'     <--After years of waiting...
|(`--A-'
|(`-/_\'\
O `'I ``\\
(\  I    |\,
 \\-T-"`, |H

Signed-off-by: Jake Whatley <jacob.whatley91@gmail.com>

Change-Id: I08a3beec8821e210986a729d3d3b30543df5c817

Conflicts:
	dashplayer/Android.mk