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

Change-Id: Ib125fcad2e4c0dc58c339fcb96c96c2af872c862