Android SDK ADT release 20
Merge "Fix aggregation exception problem"