Merge AU_LINUX_ANDROID_KK_3.5_RB1.04.04.02.006.087 on remote branch

Change-Id: Ie23275202049f8437217902f5a87e22fc4573814
Merge "Merge AU_LINUX_ANDROID_KK_3.5_RB1.04.04.02.006.087 on remote branch"
Merge branch 'kk_3.5_rb1.21' of git://codeaurora.org/quic/la/platform/build into kk_3.5_rb1.19