Merge pull request #1 from rohan-martin/dsicvs

Pull in Android_System_ANT-HAL_1-2-1