Photo Picker Design Tweaks

Removes the camera button in the top right corner and uses two buttons to take a photo and
select a photo.

Bug: 24988706

Screenshots:
https://drive.google.com/a/google.com/folderview?id=0BwSNbQ_IWQd2RWpldXJEOFhkMW8&usp=sharing

Change-Id: I579016ad0bcfcb7a2b5407717b59ed1539f1eecc