Bump Android to 6.0.1 am: 0a20c942c4
am: 1f9ba9f89e

* commit '1f9ba9f89eacd2b16805cf138df16e211b51b700':
  Bump Android to 6.0.1