am 2307eaa4: am d8f0e147: Merge "Remove unneeded PRODUCT_RUNTIMES."

* commit '2307eaa4471893ad8b6e7f49e1a0f00e87f5080e':
  Remove unneeded PRODUCT_RUNTIMES.