fix build

*missing from 4.2.2 merge

Change-Id: I1dd9710d41a2d2fb0a8a326a4d64cc6987706eef
Signed-off-by: Jonathan Steadman <xxwhitehawk@gmail.com>
Reset the FrameNumber for dropped frame in async mode

In Async, reset the framenumber of frames dropped by the BufferQueue.
This allows the client to dequeue and use this frame before the other
queued frames which may be with the MDP.

CRs-fixed: 448606
Change-Id: Icaabf77b55a7275dc98ba1fdfba89508feb92145
Revert "SurfaceFlinger: Change to support framebuffer flip for 2D blitters"

This reverts commit f442ef1dfc17ca56b88c68c318599942f94e1d68.
Merge remote-tracking branch 'aokp/jb-mr1' into aokp-mr1