Track our own Camera2

Change-Id: Ib834866eedde0573ce479cbdee6466aa7641369b
Merge branch 'lollipop' of github.com:twwolk/android into lollipop