Merge pull request #1878 from kurli/build-fail

Revert "[Android] Add xwalk_core_sample_apk to xwalk_builder"