Add missing files to Android.mk am: 58f3ba4184
authorMika Isojrvi <misojarvi@google.com>
Thu, 24 Aug 2017 18:02:12 +0000 (18:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 24 Aug 2017 18:02:12 +0000 (18:02 +0000)
am: 705eef50a0

Change-Id: I36624aac69d9298a27bf6cad86ca1057f4c77150


Trivial merge