android-5.0.0_r7

Change-Id: If0f09cb2bbbba6ccd5dbdc56a1af986fc944c284
Signed-off-by: Dirk Rettschlag <dirk.rettschlag@gmail.com>