am ad41c88a: am e3a038ba: Merge "Move frameworks/rs off AndroidConfig.h."

* commit 'ad41c88ab9c676f9625b70f36e89c92f6c855549':
  Move frameworks/rs off AndroidConfig.h.