Merge "API CHANGE: remove obsolete constants and hide some methods" into froyo