Merge "Set com.android.gallery3d as the default system gallery" into rvc-dev am: 66fe16d4 am: 2afac525 Change-Id: I8095e185951453d3846516ac529c586a2eb7bf60