Merge "sourcedr: Use relative path to android root dir" am: e4b18a88 am: ef66f25a am: 6ead7350 am: 521eeaab Change-Id: I0fcbfe84e1c6b6aa2bb08e8155276fe20e293321