Merge Base and Recommended Configurations from source.android

Change-Id: I55a1441557593cc596c3b15577575e520ce20c8b