Use -war instead of -out for generated project files

Bug: issue 8542
Change-Id: Iad321e52848b9ceba18d200bf39b5b571897d2c6
(cherry picked from commit c894264e58295ac2137112505204bd1a2956f418)
3 files changed