Merge "Don't ask libc for PT feature w/o kernel support." am: 758f448fe3

Change-Id: Ife490fbcf1482fef1b31e16273f5e196f9e8f0bc