Merge remote-tracking branch 'caf/kk_2.7_rb1.30' into HEAD

Conflicts:
	legacy/alsa_sound/AudioHardwareALSA.cpp

Change-Id: I6222bb7d8f523ae2f706b18a71730710417f75e9