DO NOT MERGE Revert "DO NOT MERGE Fix a typo in usbtuner/Android.mk" am: 298e9eaef0  -s ours am: 9adb478bf1  -s ours
am: 1852a24a7e

Change-Id: I8c6ebb0b5174bce38181241a3e8d7202116947d0