am 70a7c92e: am 65f2490e: Merge "should fix sim build, hopefully" into gingerbread

Merge commit '70a7c92e161225f587af453e01d2b124dbf6303f'

* commit '70a7c92e161225f587af453e01d2b124dbf6303f':
  should fix sim build, hopefully