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