Merge "app_main: failure to PR_SET_NO_NEW_PRIVS is always fatal." am: 796578f9a9
am: 2b283bd24f

Change-Id: I29fe2dbc5fb012248622d39afd459570714d246f