fixing some stuff
Merge branch 'android_dev'
removing android paths from master branch
Merge branch 'master' into xilinx_dev