Reconcile with ics-mr1-release

Change-Id: I409eea7f746a37d96ba1af9b60488d93e7e39d96
tree: c6cf5834094e169801550b6541dcc994998cc5ae
  1. Android.mk
  2. include/
  3. lvpp/
  4. osal/
  5. vss/