Merge "atrace: Don't NPE if we can't access hal-related tracepoint files." into oc-dev am: 638fc1f809
am: c35a2c6514

Change-Id: I3f97bed1c56b8ed47fe93489aea575a018494795