Merge "Fix missing symbols for multiple oat files case"