am 6ca669e4: Merge "Update support lib to r10." into jb-dev

* commit '6ca669e435e3f2dd8dfc084d318b856bcaa1f9a7':
  Update support lib to r10.