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