Merge commit '259b4c860212dd528b25d1cce6e74be01afed85c' into gingerbread-plus-aosp * commit '259b4c860212dd528b25d1cce6e74be01afed85c': SIP: clean up unused class and fields.
Merge commit '259b4c860212dd528b25d1cce6e74be01afed85c' into gingerbread-plus-aosp * commit '259b4c860212dd528b25d1cce6e74be01afed85c': SIP: clean up unused class and fields.