Merge "Remove PIC option from oat files."
am: 535f2f3c6b

Change-Id: I98302d0e29a4b87d1682953e445eb1cd4dd43f95