Added the android beam code
Revert "Added the android beam code"

This reverts commit a930bac446e623ed659965bddd535a438deeccab.
Got rid of some warnings