Merge "Subject: Android application files for the Activity Testing Tutorial Change-ID: If1b96a211487f43df76912bdbaf3568c1878478c"