Revert 156233 - Make apks be built in a consistent way

Revert 156233 - Make apks be built in a consistent way
This broke non-incremental Android builds.

Simplify apk targets by doing most of the work in build/java_apk.gypi
(like jars are done with build/java.gypi). The apk targets still use
their own ant build files, but everything else is more consistent
between them.

BUG=


Review URL: https://chromiumcodereview.appspot.com/10914130

TBR=cjhopman@chromium.org
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=156308

[Peter Beverloo, 2012-09-12 16:10:12]

Hi Chris,

Sorry for rolling this out as you weren't really able to know that it was going
to break, because the try-bots turned green and the main and FYI builders
remained green as well.

For clobber builds (i.e. non-incremental), this did seem to cause a compile
error, as can be seen in this log file:

http://build.chromium.org/p/tryserver.chromium/builders/android/builds/35987/...

Isaac may be able to give you an estimate on when our clobber builder will
appear on the main waterfall, which should make this more obvious. I'm not sure
if try-jobs will also change to be clobber builders.