Merge changes Iacae1087,If52f1014

* changes:
  Test Android specific SSLServerSocketFactory.getDefault() behavior
  Update the API signature files to include annotation methods