Prepare for OSR

Change-Id: I75fd84e9dae8724aafbb2c04788c255213b9fa4e
Merge branch 'cm-11.0' of github.com:superatmel/android_build into cm-11.0