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