Merge "sourcedr: Use relative path to android root dir" am: e4b18a88bc
am: ef66f25a41

Change-Id: Ifaa1f0dd623ca7ae6c40edabf56a4977d2d82cbb