Merge "Set LOCAL_INJECT_BSSL_HASH for updater" am: 0af65d8c4a am: a706ceec37
am: 9254aea083

Change-Id: Ifa24107663254f3c08d2a261fef89a57ceae36a4