[automerger skipped] Don't append build directory to the output path twice....
[automerger skipped] Don't append build directory to the output path twice. am: 55285bab am: e29f289c -s ours
am skip reason: Change-Id Ie03c9e688013b9a3e6bc859c936d89c538ded76a with SHA-1 f798c3ec is in history
Change-Id: I64a80f42cabd2f6d4a2ac50c5881f1f7a53bee74