Merge Android2Master

Move it to FrontEnd/Android