Merge changes I2ba1a613,Icfa4d975

* changes:
  Set default visibility to private
  Fix formatting of luni/src/test/java9language/Android.bp