Merge branch 'master' of git://git.ti.com/tas2557sw-android/tas2557-ftc