Revert back to my Gallery2 & Camera repos.
These work just fine.
Signed-off-by: task650 <task650@gmail.com>