Android added "Activity_" prefix to classes that extend "Activity"
Merge remote-tracking branch 'origin/master'