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