Merge "RTP: remove froyo-compatible code." into gingerbread