tree 5b8034d8187211bc52211270dcab694f27a4d651
parent 61ac53a0fcf94dca67196deff63bc6726aa89438
parent 3c611bc533a877dad4a995a741b66dbb0ec3843a
author Sasha Smundak <asmundak@google.com> 1553056613 -0700
committer android-build-merger <android-build-merger@google.com> 1553056613 -0700

Merge "Convert tests/**/Android.mk files to Android.bp, part II" am: e1f19a6ef9
am: 3c611bc533

Change-Id: Id521f08f6f2225edaf17e5ce99b971d34252df24