Merge "Move frameworks/rs off AndroidConfig.h."