Galaxys2-common: Fix google camera crash

Change-Id: I1283a83a111cfcc3c70d564c23aed482bcfa613a