Merge "Add minijail to whitelist.go" am: 3f561c692d am: c4682b44de

Change-Id: I208704def4453c0412fb4c3c4ecccfb95e873644