am 705ab8db: Fix sim build - remove unncesessary header.

Merge commit '705ab8db827b0f7f3389463af67d173c8a94fc8a' into gingerbread-plus-aosp

* commit '705ab8db827b0f7f3389463af67d173c8a94fc8a':
  Fix sim build - remove unncesessary header.