Merge "fix android beam icon and add make file" into ics-mr0