libion symlink

Change-Id: I8cb2f03ffdb81e9f5ad0f78f603af3c0feeae240
Add more camera includes

Change-Id: I219d26e8eb60573cd6b4072eff2f42be5902b810
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2