merge t989 source on AU_LINUX_ANDROID_JB_2.5.04.02.02.40.184

Change-Id: I2bbcadc161787dc3233f93695adf6c297de81843