Ready more build rules for dir move am: ca6e67a66b am: 8914da07e9 am: 742ca033ce

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

Change-Id: I126bf24af796063e921ef2a5a8e732c64b540970
Signed-off-by: Automerger Merge Worker <[email protected]>