Merge commit '15f7ff3c5a0a99f75b6c0babdc1d44e4b8aab39f' into gingerbread-plus-aosp * commit '15f7ff3c5a0a99f75b6c0babdc1d44e4b8aab39f': Fix compile errors in telephony tests
Merge commit '15f7ff3c5a0a99f75b6c0babdc1d44e4b8aab39f' into gingerbread-plus-aosp * commit '15f7ff3c5a0a99f75b6c0babdc1d44e4b8aab39f': Fix compile errors in telephony tests