CherryPick 67000f from master. do not merge.

Fix ADT builder to use the modified ApkBuilder api.

Change-Id: Id73c5994748187396d3d9cd21dff3c2efa377504
2 files changed