Merge "Remove few obsolete target files" am: 082248137d am: 6798ebf3c7
authorPyry Haulos <phaulos@google.com>
Tue, 27 Sep 2016 00:44:39 +0000 (00:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 27 Sep 2016 00:44:39 +0000 (00:44 +0000)
am: 9db4f9ce9a

Change-Id: If24f503d771e92efa39f83106e2926d032be7535


Trivial merge