am a674a571: am 20bea000: Merge "Cherry-pick "generate PIC code"."

* commit 'a674a571dbf0eebf4825f80f3ab229b1d62d49da':
  Cherry-pick "generate PIC code".