am 8d282698: am 65ca752a: Merge "Add FORCE_BUILD_RS_COMPAT option."

* commit '8d28269837276155b6478346b26e97239bfd5639':
  Add FORCE_BUILD_RS_COMPAT option.