Merge "Fix AOSP stripping out Dagger classes."