Merge "packages/apps/Gallery: Set LOCAL_SDK_VERSION where possible." am: 187c22b4cc
am: b9f470ed4a

Change-Id: I7fc3536454d501da37622e4ce8bf476281bc214f