Deleted files that didn't get deleted during merge of Android to master