am 40b4e23a: Merge "resolved conflicts for merge of 1665c8e1 to...
am 40b4e23a: Merge "resolved conflicts for merge of 1665c8e1 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp
* commit '40b4e23a':
Revert "SurfaceFlinger: Attempt to attribute fds to layers"