Merge 981de641d121f13c55ea700a24b855f29351b78d on remote branch

Change-Id: Ifa5c63264c3778246eee5333d351b1f13db3f730
diff --git a/Android.mk b/Android.mk
index b6c2bb5..89388a3 100644
--- a/Android.mk
+++ b/Android.mk
@@ -11,6 +11,8 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
+ifneq ($(TARGET_NO_TELEPHONY), true)
+
 LOCAL_PATH:= $(call my-dir)
 
 include $(CLEAR_VARS)
@@ -79,3 +81,4 @@
 include $(BUILD_PACKAGE)
 
 include $(call all-makefiles-under, $(LOCAL_PATH))
+endif # TARGET_NO_TELEPHONY
\ No newline at end of file