[automerger skipped] Merge "Ready more build rules for dir move" into udc-dev...

[automerger skipped] Merge "Ready more build rules for dir move" into udc-dev am: 9d7cd379 am: eb2517c4 -s ours am: 189268ac -s ours

am skip reason: Merged-In Ib2776dfc6c67b2042fb2f43a1251cd6f0ba61dc7 with SHA-1 a5d4de95 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23128351



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