Merge "Allow fixup of apex directories." am: 53c707781a am: b57824f4c1

Original change: https://android-review.googlesource.com/c/platform/development/+/2072700

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