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