Merge "libcore.io.OsConstants is dead; long live android.system.OsConstants!"