am 64ecf9f9: am 6eb15c25: Merge "Provide a flag to disable TBAA for RS (and disable TBAA temporarily)."

* commit '64ecf9f9a67c35a5a4858657fedf52f0299818e2':
  Provide a flag to disable TBAA for RS (and disable TBAA temporarily).