Ready more build rules for dir move am: ca6e67a6 am: 8914da07 am:...

Ready more build rules for dir move am: ca6e67a6 am: 8914da07 am: 742ca033 am: 9112fb4c am: b36aa2af am: 6855f794

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



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