Merge "Move Gallery2 and its libs to /product" am: 54f4f9153d
am: 4453b6aec7

Change-Id: I1e25a709d087e9b9f5918394a6770f1d5d7bb3bb