Android samples reorganized

Duplicate samples removed. Some samples renamed.