am f04f391b: am 4548e7f4: Merge "Remove AndroidConfig.h."

* commit 'f04f391b5f036563f71aa0c1805dc86c09137e98':
  Remove AndroidConfig.h.