Merge changes I8e538700,I336212a6

* changes:
  Improvements to preview scaling on IMS video calls.
  Fixed some strict mode violations.
tree: 7137a85d41c33b882c4fcbc0d74b79b14e06a60f
  1. assets/
  2. java/
  3. Android.mk
  4. AndroidManifest.xml
  5. LICENSE