merge.sh - merge bionic upstream

Change-Id: Id2d1032867c9858f118b9162605d0dc4fc1d77cc