Add JNI dependencies for user builds

 * JNI libs weren't being built on user builds. Fixit!

Change-Id: Ia5fa6a994c0110ca44d5b87f60563bf7d4aef3e6
Revert "Phone: Display Supplementary Service Notifications"

This reverts commit d27d964e41bd33059baecc7312b7180f25c81a7c and
restores our own SSN handling.

Change-Id: Ib61a3e94599f684e414e98969712aaa285714b79
Merge "Add JNI dependencies for user builds" into jb3
Merge "Revert "Phone: Display Supplementary Service Notifications"" into jb3