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

Change-Id: Ifdbba7c1a6c38adf90541aa7b3e993668134498f