Merge commit '16cc72bdef471ffeee3f61eba8262783de248b04' into eclair-plus-aosp * commit '16cc72bdef471ffeee3f61eba8262783de248b04': Fix simulator build.
Merge commit '16cc72bdef471ffeee3f61eba8262783de248b04' into eclair-plus-aosp * commit '16cc72bdef471ffeee3f61eba8262783de248b04': Fix simulator build.