Revert "Merge commit 'AU_LINUX_ANDROID_KK_2.7.1.04.04.00.017.002' into HEAD"

This reverts commit 867fd65185aaa7dcc32f4c4c98448208bb343771.