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

Change-Id: I77781ad613e7452a076e4507b77cd0af56751290