Merge "galaxys2: add netflix hack" into cm-10.2