Merge "HACK: android: exit(1) if selabel_lookup fails" am: 412c46afdf
am: 6c826a6fc9

Change-Id: I4abfb2ae25b498ede40399d6a5226b90f8f28687