Android SDK ADT release 20
Merge "One more update for libbcinfo."