am b84acd02: Merge "Fixed the camera test instrumentation target naming issue." into froyo

Merge commit 'b84acd02e46f87dead1fa75abb14427bf29ba8d8' into kraken

* commit 'b84acd02e46f87dead1fa75abb14427bf29ba8d8':
  Fixed the camera test instrumentation target naming issue.