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

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