Merge changes I7fd53084,I6b7a3062

* changes:
  Properly export toolchain static libs
  Add more make-exported variables