Merge pull request #454 from asmorkalov:android_samples_reorganize