Try to improve the code viewer
Target the latest Android SDK