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

Change-Id: I8b3b751cce3cb1bec82883995ee408e7ab0ceef6