Merge "Add --classes optional flag in list_files" am: 32efc846 am: 46c121d2

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



Change-Id: I9e4c89600cabf98b4fc7d7779af286f0ba41e89d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>