am 7578e575: Merge change 23155 into donut

Merge commit '7578e57567d63139b563e2a3c6face707beeb931' into eclair

* commit '7578e57567d63139b563e2a3c6face707beeb931':
  Change CTS makefiles so apps are built in data not system partition.