Merge Android.mk/ from platform/packages/apps/Gallery2 to Android.mk/