Merge "Pass updatable BCP packages to dex2oat." am: 6ad2e2f751 am: e651af5910

Change-Id: I1e50458d4542c7e23bddd9312a9466fa75b984ab