resolve merge conflicts of 9b726ab8 to master
authorMika Isojärvi <misojarvi@google.com>
Fri, 22 Sep 2017 17:39:21 +0000 (10:39 -0700)
committerMika Isojärvi <misojarvi@google.com>
Fri, 22 Sep 2017 17:39:21 +0000 (10:39 -0700)
Test: Ran scripts/check_build_sanity.py build Android CTS.
Change-Id: Ibc797d43c71edee9a82592369f30d6a72bfcde2f


No differences found