Merge "Update runner to AndroidJUnittest" am: 51262f2a8a am: ac81f92821 am: 1faeca1d0d am: 5dd12e082a am: 355b4fff08
Change-Id: Ie5ab3a7e98175b461eb5c54a04b9f586f80c8160
This commit is contained in: