Merge changes I19ef6b50,I5615960a

* changes:
  Only show video call option in the call log when appropriate
  Switch to PROTO2 for better AOSP compatibility.
tree: 5ef7370fb052d15594cae2b43568439f476e5f28
  1. assets/
  2. java/
  3. Android.mk
  4. AndroidManifest.xml
  5. LICENSE