Merge "Fix missing symbols for multiple oat files case" am: ac4804fb36 am: 4c070c579f
am: 49e7d8fb3b

Change-Id: Ibe444a67accab35656157cf314d60b26843b5a38