Merge "Only look for method optimization annotations in the bootstrap class loader."
am: 9d7fd996bb

Change-Id: I4fa41501db82742fe03a976835df2a94dada5a7f