Merge "Changed ravenwood-junit to use module_current" into aosp-main-future