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

Change-Id: I61f0292348da4f3f5b6d3e933cafd8de8cfc8195