[US159.1] [CCA patch] Port to x86 merge from Android-x86