Merge google patchs from AOSP on sdk/emulator until patch bf5add6bd5d87796621799d9da82db06b5d15f60 (11 aug 2013)