Make Android take everything.
Make Android take everything.

Instead of removing the things Android doesn't want, merge
everything. This greatly simplifies the merge process. If git
merge --no-commit fails, we now know that there is an actual
merge failure, as opposed to a conflict between us modifying
something and Android (needlessly) deleting it.

BUG=skia:2409
BUG=skia:2416
R=borenet@google.com, epoger@google.com

Author: scroggo@google.com

Review URL: https://codereview.chromium.org/240093005

Tiger66639/skia-buildbot,google/skia-buildbot,google/skia-buildbot,google/skia-buildbot,Tiger66639/skia-buildbot,Tiger66639/skia-buildbot,google/skia-buildbot,google/skia-buildbot,google/skia-buildbot,Tiger66639/skia-buildbot,google/skia-buildbot,Tiger66639/skia-buildbot,google/skia-buildbot,Tiger66639/skia-buildbot,Tiger66639/skia-buildbot