[automerger skipped] Merge "Fail check-boot-jars if boot jar contains 0 .class files" am: e5fc8fdf5e am: 7e3a36b3ef -s ours

am skip reason: Change-Id I0e8ebd318312949bc58ba7a5c89f9e265b8bedf2 with SHA-1 92d41de8f2 is in history

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

Change-Id: Ie3a7d9df6c727257d85b23714abc06dceea155cb