am e6f643fa: am 7bbffa83: Merge "Update RS prebuilts with support lib LOCAL_SDK_VERSION fix."

* commit 'e6f643faf8721f0cb03affe72781adf95a2a3363':
  Update RS prebuilts with support lib LOCAL_SDK_VERSION fix.