Merge changes from topic 'b36093860'

* changes:
  QCamera2: fix the wrong casting
  QCamera2: Fix definition of OIS modes
tree: af5304102e730193c739a385f645b832d82ac736
  1. msm8998/
  2. Android.mk
  3. CleanSpec.mk