Merge "Fix droiddoc when OUT_DIR is an absolute path" am: 85f095e246 am: b42cfb691d
am: 4f11d4c526  -s ours

Change-Id: Ib8596dda23c9ad1fb85f76df5545796e8620bd01