Merge "Always produce PIC code for AOT compilation." am: 59d0872519
am: 97d4e469c2

Change-Id: I1d3c81d95e46d483c61ccc156bc5314c22a455ec