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