Merge "Fix missing symbols for multiple oat files case"
am: ac4804fb36

Change-Id: Ic20dc84b90ed0964d12b63d6327c8487a19c4ce3