Make ApkBuilder create filenames supported by older rules.

Make ApkBuilder create filenames supported by older rules.

'ant install' must know the debug apk filename so newer naming scheme breaks
on older rule files (1.5 and earlier).
The fix is to check for the presence of the property naming the debug,
signed, unaligned package. If the property is present, then we use
the new naming scheme ({base}[-{config}]-debug-unaligned.apk), else we use
the old one ({base}-[-{config}]-debug.apk).

Also merge the install/reinstall targets, since 'adb install -r <file>'
works even if the apk was not yet installed.

DO NOT MERGE