Merge "Set com.android.gallery3d as the default system gallery" into rvc-dev am: 66fe16d41c

Change-Id: Idaa0f87e42c08d9f4bbbbb605a0604c99d1a9614