Bump Android to 6.0.1
am: 0a20c942c4

* commit '0a20c942c4bb110ebd971e7959ed1b2fa53e452a':
  Bump Android to 6.0.1