Merge branch 'merge-minijail-rewrite' into merge-minijail BUG=chromium:392609 Change-Id: Iaa48a088a1ed34afbedcaa7ab7f1b2999fc55b82