Merge "Import Jetifier from build 4870318" am: 9e88952afb
am: b1fbe27c7d

Change-Id: I634a7289b5ecff8a09a07f8de90f2e12c35ec038