HLTE: Android expects SW_LID, not SW_FLIP.

Change-Id: I1f38f1aff1c5f410529ba788fa0980cced44b297
Merge branch 'cm-11.0' into kk_mkt