[automerger skipped] Merge "Use implicit output for prebuilt aar manifests"
am: 6021800c45  -s ours

Change-Id: Id1c88d15484b2d6a545be0160b5bf51d6e1d3bc6