Merge "Remove PIC option from oat files." am: 7f72e5060e am: 587a080e36
am: cf5e2a1c03

Change-Id: Ibab6eb54f7de8f6db3be320d374fd8cd992724e1