Merge "change target to androideabi" into jb-mr1-dev