resolve merge conflicts of e8a3ea8 to nyc-mr1-dev-plus-aosp

Change-Id: Ied5ddc04e6da65cba62698cd18ba78496f5fb646

diff --cc Android.mk
index b644a17,2c99df7..c3f250d
--- 1/Android.mk
--- 2/Android.mk
+++ b/Android.mk
@@@ -1103,8 -1106,10 +1103,8 @@@ LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=bui
  include $(BUILD_DROIDDOC)
  
  static_doc_index_redirect := $(out_dir)/index.html
- $(static_doc_index_redirect): $(LOCAL_PATH)/docs/docs-preview-index.html
 -$(static_doc_index_redirect): \
 -      $(LOCAL_PATH)/docs/docs-documentation-redirect.html | $(ACP)
 -      $(hide) mkdir -p $(dir $@)
 -      $(hide) $(ACP) $< $@
++$(static_doc_index_redirect): $(LOCAL_PATH)/docs/docs-documentation-redirect.html
 +      $(copy-file-to-target)
  
  $(full_target): $(static_doc_index_redirect)
  $(full_target): $(framework_built)