Merge "Set com.android.gallery3d as the default system gallery" into rvc-dev am: 66fe16d4 am: 2248929e Change-Id: I6c0f062925c78ec0134b04c109f77153fad0c35a