Revert "frameworks: underp api's when using java 1.7 on telephony builds"

This reverts commit 6d731c34a3b9fac2e5f8a4edf275222d24497993.