Check duplicate layers and extensions am: abf60ccfd2
authorMika Isojärvi <misojarvi@google.com>
Wed, 15 Jun 2016 17:55:50 +0000 (17:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 15 Jun 2016 17:55:50 +0000 (17:55 +0000)
am: 45eb53eb43

Change-Id: Icdc58f937ff6acf78e91220aeca14229beee888d


Trivial merge