Check duplicate layers and extensions am: abf60ccfd2
authorMika Isojärvi <misojarvi@google.com>
Wed, 15 Jun 2016 18:04:48 +0000 (18:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 15 Jun 2016 18:04:48 +0000 (18:04 +0000)
am: ed1c0a2092

Change-Id: Ie8644d3a93b4b24007ded42f8500c45bf98a69e4


Trivial merge