Merge "Merge "ueventd: don't double fork firmware handlers" am: 0f4fb5497a" into stage-aosp-master
am: 3752ae8474

Change-Id: Id88c3f665131cafd5d7d3d8fc0159997d92130f0