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

Change-Id: I7bb7132e2efff9bb0391a4c7f606ad0fe3232de5