Fixed comment

(cherry picked from commit 284635078a7ea56768c4e1f40e0dc373406c68df)
Updated build scripts

(cherry picked from commit d77ca949ffca1e678769835fe507ada51f919feb)