Underp public API... again

Change-Id: Ibb8d74cec9de3c2227451d33f3fe4ce82a731514
Underp the Underp public API... again

Change-Id: I7841c3c4d58dc224dc0e83f46b06cb1de93987a2
Merge branch 'jb-devel' of github.com:codefireXperiment/frameworks_base into jb-devel