Merge "Update fw/rs for Clang 3.5."