Merge "Update SDK files to API 12/Android 3.1" into honeycomb-mr1