Merge "Add --auto-add-overlay option to aapt. DO NOT MERGE" into eclair