[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: 0d27dd22 -s ours
am skip reason: Change-Id Ie03c9e688013b9a3e6bc859c936d89c538ded76a with SHA-1 f798c3ec is in history
Change-Id: Iab5d1aad66b785201b73ece6083c836567a7dcc5