Change-Id: If6ee98e4a723b643bc37254fc6ef8b3812db16da
LGTM
Sorry for the stale copy-and-paste buffer noise. This did NOT break non-PIC builds.