Merge "Fix a typo in Drawable's javadoc" into mnc-dev