am cb643f61: (-s ours) am ad41c88a: am e3a038ba: Merge "Move frameworks/rs off AndroidConfig.h."

* commit 'cb643f619cdfc7452fd3398ef6eb85e962d593e0':