Merge "Remove Activity Recognition from the Android Code."