Merge "Add dexlayout support for call sites and method handles."