Merge "Fix droiddoc when OUT_DIR is an absolute path" am: 85f095e246
am: b42cfb691d

Change-Id: I8af7eee810e05ba6ba7d42cdddc6efee8963b141