perfect android staging is almost complete

Change-Id: Ib5c83280cecc7c4e3f12a36783de2da805649f63