am 284b891b: Merge "Fix PropertiesTest, delete ServiceLoaderTest & PackageTests."

* commit '284b891b2cf3adcb481f27c0fb8f31ee2c17a62e':
  Fix PropertiesTest, delete ServiceLoaderTest & PackageTests.