Revert "Revert back to my Gallery2 & Camera repos."

This reverts commit 03b9da175bc8bfaa031cf9dfa067bd4cc4831de8.