Update android support. Fix #41