Check duplicate layers and extensions
authorMika Isojrvi <misojarvi@google.com>
Wed, 15 Jun 2016 17:51:35 +0000 (17:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 15 Jun 2016 17:51:35 +0000 (17:51 +0000)
am: abf60ccfd2

Change-Id: I7b73373bf10f3db0530da27026e329490d78620a


Trivial merge