Merge "Don't call public non-final getResources() from getAssets()"