Merge "Restore libcore Cookie(Manager|Store) behavior"