Merge "Merge "ueventd: don't double fork firmware handlers" am: 0f4fb5497a am: e944b7e0a4" into oc-dev-plus-aosp am: 1a4bc908f2
am: f944ba812d

Change-Id: I3b30f9d838707ae9374a369e0517c2fff380f0e0