Merge commit '08faac3c26e12863858e1534985dd950193f755f' into gingerbread-plus-aosp * commit '08faac3c26e12863858e1534985dd950193f755f': Unhide SIP API.
Merge commit '08faac3c26e12863858e1534985dd950193f755f' into gingerbread-plus-aosp * commit '08faac3c26e12863858e1534985dd950193f755f': Unhide SIP API.