android_ for cm

Change-Id: Iddb9e080ff9247e3dc8ecbe047a80dddc660957f