Remove dependency on AndroidConfig.h.

Change-Id: Ia21083b0392cc5acf5b1bbd7637a0cd0dd1fb01b
Merge "Remove dependency on AndroidConfig.h."