Merge "Stop prebuilt_apex/apex_set exporting invalid jars to Make" am: 13dd220448

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1853520

Change-Id: I5b1dd835c33e1c4efe4ed2f142afcc68aa0aa1d7