am 996fb989: (-s ours) DO NOT MERGE. Fix for 5247764 profile and level settings are not always correctly set

* commit '996fb989eb4cbe80c91cfe3ef4d32f349dffa72d':
  DO NOT MERGE. Fix for 5247764 profile and level settings are not always correctly set
tree: e3445678b82967c33e62202dadd9db6d57e76f7b
  1. include/
  2. lvpp/
  3. osal/
  4. vss/
  5. Android.mk