add correct toolchain paths and fix roomservice.py

Signed-off-by: jaysurp <jaysurp031@gmail.com>
Merge branch 'cm-12.0' of https://github.com/OwnROM/android_build into cm-12.0