Update android revision, pull more from cm