[automerger skipped] [DO NOT MERGE] Modify D8 template to not have inputs under the output directory. am: 0ba998c3 am: a3933f76 -s ours am: a5adf6ac -s ours am: 91218456 -s ours am: 2070f062 -s ours am: 42955114 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12468476

Change-Id: I1a29747477aec51ccbc04c1c27c664b558dbb356