android_ tag for cm,...

Change-Id: I660075908f7f1f4a2ffc56fc34ab5d9a872eefe4