Apply Android patches and fix them up for M

Change-Id: I18b5eec76213491f041bcb6c44a0d621c8501544
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
12 files changed