Merge "fix android beam demo path" into ics-mr0