Android mk changes.