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

Change-Id: I70db7f9fcedc2569e1e2dcc9f3e544e2e2ec6a8f