Merge "Add new build flag LOCAL_DONT_DELETE_JAR_DIRS."