Merge "Revert "Fix Dialer Android.mk for compiling with javac""