Merge changes I9876ff6b,Iccd7c1c1 into pi-dev

* changes:
  Add more hidden API on light greylist
  Add Thread.contextClassLoader to hidden API light greylist