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

Change-Id: Iaf9f2fe69b9cefb0424896b1e90dc281da03e52d