Android SDK ADT release 20
Merge "Simplify board-info for 4.0.4"