Merge "Fix zipalign/hprof-conv issue in ADT." into idea133
automerge: 2206210

* commit '220621089bd6a7cfac2c3d1a0fa8aeeffc94391b':
  Fix zipalign/hprof-conv issue in ADT.