Merge "Choose ABI dump directory according to the tag on the lsdump"
am: 49768683cd

Change-Id: I1161a2b45507a11bb4b1befc41367b4b9403b077