Test: make general-tests Bug: 120093339 Merged-In: I363450d205868f900e4925ccff1430e2a569f2a4 Change-Id: I363450d205868f900e4925ccff1430e2a569f2a4
Bug: 111098596 Test: vts, atrace and systrace (cherry picked from commit db895ad8da) Change-Id: Iea4ee4bff7509031a6daaf7c9570d0583a59affa
db895ad8da