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

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

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