[automerger skipped] Merge "Pass updatable BCP packages to dex2oat." into...
[automerger skipped] Merge "Pass updatable BCP packages to dex2oat." into rvc-dev am: 9dd3abd5 am: 7ebc8144 -s ours am: 5ed8ad2f -s ours
am skip reason: Change-Id I904fd0ba79350e01158321383b7b1fe5390caddf with SHA-1 79dc3c68 is in history
Change-Id: I0856d77fcf7e57451c57bf6c611bb5f40fdbe59b