Merge "Update runner to AndroidJUnittest" am: 51262f2a8a

Change-Id: Ie828d6417fb7966befc8d8d188a3ad8576999a5e