Merge commit '65f2490e1baa6eac5905cbc638e69581ebcd8dee' into gingerbread-plus-aosp * commit '65f2490e1baa6eac5905cbc638e69581ebcd8dee': should fix sim build, hopefully
Merge commit '65f2490e1baa6eac5905cbc638e69581ebcd8dee' into gingerbread-plus-aosp * commit '65f2490e1baa6eac5905cbc638e69581ebcd8dee': should fix sim build, hopefully