Merge "DO NOT MERGE Removing unused features from source tree. Please refer to Bug#2502219." into froyo