Merge "Fix google-explicit-constructor warnings in frameworks/base"