Merge commit '2be56ccbcff9d5f7b9b3cc0fed3825d4f037ff6a' into eclair-plus-aosp * commit '2be56ccbcff9d5f7b9b3cc0fed3825d4f037ff6a': Add --auto-add-overlay option to aapt. DO NOT MERGE
Merge commit '2be56ccbcff9d5f7b9b3cc0fed3825d4f037ff6a' into eclair-plus-aosp * commit '2be56ccbcff9d5f7b9b3cc0fed3825d4f037ff6a': Add --auto-add-overlay option to aapt. DO NOT MERGE