Make android specific changes to conf files.

Change-Id: I60bfb7cf24f1152913f944652e413509a6c31f26
2 files changed