[automerger skipped] Merge "Replace javaLibrary with java.Dependency,android.Module" into rvc-dev am: c91aafb6 -s ours am: 255dfdb8 -s ours
am skip reason: Change-Id Ie533c16c753dc9c43171d0223953adea7b2b5ee6 with SHA-1 f299cbef is in history
Change-Id: I69602dbb1f7ec753dfae4cfcc1ab50d8fe241c36