Merge tag 'AU_LINUX_ANDROID_JB_2.5.04.02.02.040.319' into HEAD

AU_LINUX_ANDROID_JB_2.5.04.02.02.040.319 based on quic/aosp/jb_2.5