Merge "Use prebuilt addr2line on host"
am: 8a64e773d4

Change-Id: Id525a1253e2338c381c4013964588d06e437f829