fixing problems due to merging web/core/android