Android 7.1.0 release 2
Fix merging add/remove on same method.
am: 8f27032b2a

* commit '8f27032b2aaf133892562f83314efa39a9c2353c':
  Fix merging add/remove on same method.

Change-Id: Ibc3ee191d337b882db84c47fbab4f703c2b494a1