tree 33e9eaa836edec77956352337c9f874b01063b50
parent a973b5c3fcf397fa6f7ec4c1c7d4d2af31cbec72
parent 7404cdce4873a4969be5552b4f354114a885f3c3
author Sasha Smundak <asmundak@google.com> 1552671547 -0700
committer android-build-merger <android-build-merger@google.com> 1552671547 -0700

[automerger skipped] Merge "Convert Android.mk file to Android.bp" am: 9beab9980b am: fdfbf6cda8
am: 7404cdce48 -s ours
am skip reason: change_id I16795323c51914fffcb4be86445da00adfa62fbf with SHA1 3fe49a50d0 is in history

Change-Id: Ieddd3e670530eda95e901182a3e4980c476ad0ce