merge from ICS

- clean up unused views
- remove too high bit-rate clips
- skip tests if there is no camera

Change-Id: Iba91656d8d375a74286982735218943482a91acb
4 files changed