am f6b7171e: am 270a609e: Merge "Add telephony intermediates to classpath"

* commit 'f6b7171edf6f89264ea58af0e9b21fdb419d6feb':
  Add telephony intermediates to classpath