Merge "Clean up ArrayAdapter lint warnings and annotations" into nyc-dev