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

Change-Id: Ie6c9b72d809c9e2c65a4d6b250d1d416844f300e