Moved to android folder

Change-Id: Ie03a2fb1ce54104a38d5066091a409cbf9420ab5